projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0c43b6f
)
* lisp/calendar/appt.el (appt-activate): Check diary file.
author
Glenn Morris
<rgm@gnu.org>
Wed, 29 Sep 2010 03:54:03 +0000
(20:54 -0700)
committer
Glenn Morris
<rgm@gnu.org>
Wed, 29 Sep 2010 03:54:03 +0000
(20:54 -0700)
lisp/ChangeLog
patch
|
blob
|
history
lisp/calendar/appt.el
patch
|
blob
|
history
diff --git
a/lisp/ChangeLog
b/lisp/ChangeLog
index e3703ebaba17ee6d2edd3824e1c97199ef72f2e2..b645e41f5d5a403fcbe7351fdd3bcc7395dad4f6 100644
(file)
--- a/
lisp/ChangeLog
+++ b/
lisp/ChangeLog
@@
-1,3
+1,7
@@
+2010-09-29 Glenn Morris <rgm@gnu.org>
+
+ * calendar/appt.el (appt-activate): Check diary file.
+
2010-09-29 Katsumi Yamaoka <yamaoka@jpl.org>
* pgg.el (pgg-run-at-time-1): Define it for XEmacs only; fix if/else
diff --git
a/lisp/calendar/appt.el
b/lisp/calendar/appt.el
index d0ad64645106e1385fc531c92125ad5f736e45a2..4926e79c2b5b0d7ded297fbdaacccb53d3bc032f 100644
(file)
--- a/
lisp/calendar/appt.el
+++ b/
lisp/calendar/appt.el
@@
-702,6
+702,7
@@
ARG is positive, otherwise off."
(cancel-timer appt-timer)
(setq appt-timer nil))
(when appt-active
+ (diary-check-diary-file)
(add-hook 'write-file-functions 'appt-update-list)
(setq appt-timer (run-at-time t 60 'appt-check)
global-mode-string